Skip to content

[SYCL] Fix name collisions in SYCL enums #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 23, 2021
Merged

[SYCL] Fix name collisions in SYCL enums #4154

merged 8 commits into from
Jul 23, 2021

Conversation

denis-kabanov
Copy link
Contributor

Correcting the definition of some macros causes name collisions if they are defined prior to including of CL/sycl.hpp.

Correcting the definition of some macros causes name collisions if they are defined prior to including of CL/sycl.hpp.
Correcting the definition of some macros causes name collisions if they are defined prior to including of CL/sycl.hpp.
@denis-kabanov denis-kabanov requested a review from a team as a code owner July 21, 2021 14:31
Correcting the definition of some macros causes name collisions if they are defined prior to including of CL/sycl.hpp.
bader
bader previously approved these changes Jul 21, 2021
Copy link
Contributor

@bader bader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a couple of other suggetions.

bader
bader previously approved these changes Jul 21, 2021
Copy link
Contributor

@bader bader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, although I think someone from runtime team should take a look and make sure this change doesn't break library ABI.

@denis-kabanov denis-kabanov changed the title [SYCL][NFC] Fix name collisions in SYCL enums [SYCL] Fix name collisions in SYCL enums Jul 22, 2021
@denis-kabanov denis-kabanov requested a review from bader July 22, 2021 15:16
@dm-vodopyanov
Copy link
Contributor

ABI didn't break, luckily, we don't have such enums in exported symbols.
@sergey-semenov, can you please review?

@bader bader merged commit 1419415 into intel:sycl Jul 23, 2021
@bader
Copy link
Contributor

bader commented Jul 23, 2021

Next, I would expand CG to CommandGroup everywhere.

@denis-kabanov
Copy link
Contributor Author

Next, I would expand CG to CommandGroup everywhere.

Created an internal ticket

alexbatashev added a commit to alexbatashev/llvm that referenced this pull request Jul 27, 2021
…ackend_plugin

* upstream/sycl: (755 commits)
  [SYCL] Add operator= to atomic_ref specializations (intel#4183)
  [SYCL] Make spelling of Debug value for CMAKE_BUILD_TYPE variable case insensitive (intel#4069)
  [SYCL][LIBCLC] Add atan and cbrt for amdgcn-amdhsa (intel#4180)
  [SYCL][CUDA] Correctly free managed memory (intel#4181)
  [SYCL] Revert barrier deprecation note (intel#4162)
  [SYCL][FPGA] Refactor of statement attributes (intel#4136)
  [Driver][SYCL] Enable way to emit int-footer source to a specific dir (intel#4167)
  [Driver] Fix default MSVC version setting for -fms-compatibilty-version (intel#4165)
  [BuildBot] Add llvm-enable-projects flag to configure.py (intel#4169)
  [Driver][SYCL][FPGA] Improve aocx archive processing for FPGA (intel#4160)
  [SYCL] Correct int-header emission with type aliases
  [SYCL] Fix name collisions in SYCL enums (intel#4154)
  [SYCL] Return the correct status info for host_task event (intel#4161)
  [ESIMD][NFC] Added tests for simd class type traits (intel#4146)
  [SYCL][ROCm] Fix missing parameter in ROCm plugin (intel#4166)
  [SYCL][L0] Add temporary option to allow user to use copy engine for device to device copy (intel#4127)
  Remove check for AMD HIP to fix Driver/cuda-arch-translation.cu
  Reapply after conflict resolution 418a6d6 "Fix nvptx_target_teams_distribute_parallel_for_simd_codegen failure"
  Revert "[SYCL] Removes redefinitions of macros in libclc (intel#3505)"
  [PGO] Change test-run line to check NewPM pass behavior
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants